diff --git a/board/mgcoge/Makefile b/board/keymile/mgcoge/Makefile
similarity index 95%
rename from board/mgcoge/Makefile
rename to board/keymile/mgcoge/Makefile
index d4087cc..e00295d 100644
--- a/board/mgcoge/Makefile
+++ b/board/keymile/mgcoge/Makefile
@@ -22,6 +22,9 @@
 #
 
 include $(TOPDIR)/config.mk
+ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../common)
+endif
 
 LIB	= $(obj)lib$(BOARD).a
 
diff --git a/board/mgcoge/config.mk b/board/keymile/mgcoge/config.mk
similarity index 100%
rename from board/mgcoge/config.mk
rename to board/keymile/mgcoge/config.mk
diff --git a/board/mgcoge/mgcoge.c b/board/keymile/mgcoge/mgcoge.c
similarity index 100%
rename from board/mgcoge/mgcoge.c
rename to board/keymile/mgcoge/mgcoge.c
diff --git a/board/mgsuvd/Makefile b/board/keymile/mgsuvd/Makefile
similarity index 94%
rename from board/mgsuvd/Makefile
rename to board/keymile/mgsuvd/Makefile
index af0d400..efdd410 100644
--- a/board/mgsuvd/Makefile
+++ b/board/keymile/mgsuvd/Makefile
@@ -22,6 +22,9 @@
 #
 
 include $(TOPDIR)/config.mk
+ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../common)
+endif
 
 LIB	= $(obj)lib$(BOARD).a
 
diff --git a/board/mgsuvd/config.mk b/board/keymile/mgsuvd/config.mk
similarity index 100%
rename from board/mgsuvd/config.mk
rename to board/keymile/mgsuvd/config.mk
diff --git a/board/mgsuvd/mgsuvd.c b/board/keymile/mgsuvd/mgsuvd.c
similarity index 100%
rename from board/mgsuvd/mgsuvd.c
rename to board/keymile/mgsuvd/mgsuvd.c
diff --git a/board/mgsuvd/u-boot.lds b/board/keymile/mgsuvd/u-boot.lds
similarity index 100%
rename from board/mgsuvd/u-boot.lds
rename to board/keymile/mgsuvd/u-boot.lds